Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CM] Use robot_description topic instead of parameter and don't crash on empty URDF 🦿 (backport #940) #1052

Merged
merged 9 commits into from
Nov 9, 2023
Merged

[CM] Use robot_description topic instead of parameter and don't crash on empty URDF 🦿 (backport #940) #1052

merged 9 commits into from
Nov 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 12, 2023

This is an automatic backport of pull request #940 done by Mergify.
Cherry-pick of d299208 has failed:

On branch mergify/bp/humble/pr-940
Your branch is up to date with 'origin/humble'.

You are currently cherry-picking commit d299208.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   controller_manager/include/controller_manager/controller_manager.hpp
	modified:   controller_manager/package.xml
	modified:   controller_manager/test/controller_manager_test_common.hpp
	new file:   controller_manager/test/test_controller_manager_urdf_passing.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/CMakeLists.txt
	both modified:   controller_manager/src/controller_manager.cpp
	both modified:   hardware_interface/doc/mock_components_userdoc.rst
	both modified:   hardware_interface/include/hardware_interface/resource_manager.hpp
	both modified:   hardware_interface/src/resource_manager.cpp
	both modified:   hardware_interface/test/test_resource_manager.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Jun 12, 2023
@mergify mergify bot mentioned this pull request Jun 12, 2023
Merged
1 task
destogl
destogl reviewed Jun 14, 2023
View reviewed changes
Copy link
Member

@destogl destogl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resolving conflicts

controller_manager/CMakeLists.txt Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
hardware_interface/doc/mock_components_userdoc.rst Outdated Show resolved Hide resolved
hardware_interface/include/hardware_interface/resource_manager.hpp Outdated Show resolved Hide resolved
hardware_interface/include/hardware_interface/resource_manager.hpp Outdated Show resolved Hide resolved
hardware_interface/src/resource_manager.cpp Outdated Show resolved Hide resolved
hardware_interface/test/test_resource_manager.cpp Outdated Show resolved Hide resolved
@christophfroehlich christophfroehlich mentioned this pull request Jun 17, 2023
Merged
@destogl destogl removed the conflicts label Jun 17, 2023
@bmagyar
Copy link
Member

bmagyar commented Jun 23, 2023

I see this now also has a sneaky backport of #1054 , is that intended?

@destogl
Copy link
Member

destogl commented Jun 26, 2023

I see this now also has a sneaky backport of #1054 , is that intended?

yes, it's easier to do it at once. But I can also split, once when I actually figure out what is the problem...

@destogl destogl mentioned this pull request Jun 26, 2023
Merged
@bmagyar
Copy link
Member

bmagyar commented Jun 28, 2023

yes , please split it. I'd prefer if we didn't have extra things creeping in

@bmagyar
Copy link
Member

bmagyar commented Jul 5, 2023

I think there's too much stuff in this PR. The CI clearly isn't happy

mamueluth and others added 4 commits August 14, 2023 21:49
@mamueluth @bmagyar
[CM] Use robot_description topic instead of parameter and don't cra…
6d23033 
…sh on empty URDF 🦿 (#940)

* on startup wait for robot description, however allow receiving later

---------

Co-authored-by: Dr. Denis <[email protected]>
(cherry picked from commit d299208)

# Conflicts:
#	controller_manager/CMakeLists.txt
#	controller_manager/src/controller_manager.cpp
#	hardware_interface/doc/mock_components_userdoc.rst
#	hardware_interface/include/hardware_interface/resource_manager.hpp
#	hardware_interface/src/resource_manager.cpp
#	hardware_interface/test/test_resource_manager.cpp
@destogl @bmagyar
Apply suggestions from code review
db0b545
@destogl @bmagyar
Fix to compile.
2309703
@destogl @bmagyar
Adding output to test so they would not fail.
d89e9f7
@bmagyar bmagyar force-pushed the mergify/bp/humble/pr-940 branch from 8bd416c to d89e9f7 Compare August 14, 2023 20:49
@bmagyar
Copy link
Member

bmagyar commented Aug 14, 2023

rebased and dropped the content related to #1054

@christophfroehlich christophfroehlich mentioned this pull request Aug 17, 2023
Merged
@bmagyar @Noel215
Fix segmentation fault
56b346c 
Co-authored-by: Noel Jiménez García <[email protected]>
saikishor
saikishor approved these changes Aug 17, 2023
View reviewed changes
Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest LGTM

hardware_interface/test/test_handle.cpp Outdated Show resolved Hide resolved
hardware_interface/test/test_handle.cpp Outdated Show resolved Hide resolved
@bmagyar @saikishor
fix format
50a4a76 
Co-authored-by: Sai Kishor Kothakota <[email protected]>
@avanmalleghem
Copy link

avanmalleghem commented Sep 12, 2023 •
edited
Loading

Hello, any update on this one ?

@bmagyar bmagyar merged commit b9cdcfe into humble Nov 9, 2023
11 of 12 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-940 branch November 9, 2023 10:34
@christophfroehlich christophfroehlich mentioned this pull request Dec 3, 2023
Closed
@christophfroehlich christophfroehlich mentioned this pull request Apr 4, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Noel215 Noel215 Noel215 left review comments

@destogl destogl destogl left review comments

@saikishor saikishor saikishor approved these changes

@bmagyar bmagyar bmagyar approved these changes

@anfemosa anfemosa Awaiting requested review from anfemosa

@duringhof duringhof Awaiting requested review from duringhof

@erickisos erickisos Awaiting requested review from erickisos

@jaron-l jaron-l Awaiting requested review from jaron-l

@livanov93 livanov93 Awaiting requested review from livanov93

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@bmagyar @destogl @avanmalleghem @saikishor @Noel215 @mamueluth